Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2: merge main into v2 again #2937

Draft
wants to merge 53 commits into
base: v2-dev
Choose a base branch
from
Draft

v2: merge main into v2 again #2937

wants to merge 53 commits into from
+4,107 −1,971

Conversation

hannahkm
Copy link
Contributor

What does this PR do?

merge main into v2-dev

Motivation

more conflicts :(

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

Unsure? Have a question? Request a review!

@github-actions github-actions bot added the apm:ecosystem contrib/* related feature requests or bugs label Oct 21, 2024
hannahkm and others added 19 commits October 21, 2024 16:21
@hannahkm
easy type fixes
9fa6680
@hannahkm
remove call to deleted option
d06af26
@hannahkm
another call to options
8c9279e
@hannahkm
remove internal calls 1/n
2c54fc9
@hannahkm
import and options fixes
ed1c61c
@eliottness
internal/appsec: better docs (#2935)
d48348e 
Signed-off-by: Eliott Bouhana <eliott.bouhana@datadoghq.com>
@darccio @MNThomson
[godfathering] contrib/dimfeld/httptreemux.v5: failing tests for path…
e104e1e 
… variable replacement (#2938)

Co-authored-by: Max Thomson <git@mnt.dev>
@nhulston @darccio
[serverless] Inject trace context into SQS/SNS/EventBridge (#2917)
a118199 
Co-authored-by: Dario Castañé <dario.castane@datadoghq.com>
@rarguelloF @darccio
contrib/log/slog: fix WithAttrs and WithGroup implementation (#2857)
e73b3d1 
Co-authored-by: Dario Castañé <dario.castane@datadoghq.com>
@tonyredondo
internal/civisibility: removes importing contrib packages from tests (#…
48e3a66 
…2940)
@hannahkm
remove internal kafka directory
f787fb7
@hannahkm
fix more internal kafka links
61ac0b0
@hannahkm
clean up kafka package
e770614
@hannahkm
fix broken kafka test
05625d5
@hannahkm
merge + conflict resolve
6a5284c
@hannahkm
workflows test on beta 3
91012f0
@hannahkm
clean up imports
69c8f2b
@hannahkm
edit toolchain
38b22a0
@hannahkm
remove contrib from test files
a853d8a
hannahkm and others added 25 commits October 23, 2024 14:38
@hannahkm
Revert "remove contrib from test files"
a588c11 
This reverts commit a853d8a.
@hannahkm
update refs to hannah branch
11b5baf
@darccio
fix: allow go.work to be usable in Go 1.22 (#2945)
00c300f
@hannahkm
revert to og testing branch, mod tidy
287927c
@hannahkm
remove replace from smoke test mod
5cb7b5b
@hannahkm
update smoke test mod name
12ca1dc
@hannahkm
go mod tidy
31f0edd
@hannahkm
align go mod w v2dev
f576f28
@hannahkm
mark branch as merged
aca9aca
@hannahkm
revert for wrong commit hash
e94fb8a 
This reverts commit f576f28.
@hannahkm
create replace for smoke tests
424d1d8
@hannahkm
add smoke tests to work file
55e20e9
@hannahkm
fix integration enabled test
21b44e6
@hannahkm
mocktracer and error code fixes
07f6de4
@hannahkm
fix goroutine leak in mocktracer
91218a6
@hannahkm
fix roundtripper test
e39240a
@hannahkm
fix and clean slog
46a0800
@hannahkm
fix restful test
09bf8cf
@hannahkm
fix kafka
7f20d0c 
CONFIRM FIXES ARE ACTUALLY CORRECT
@hannahkm
fix kafkav2
6d6775e 
CONFIRM FIXES ARE ACTUALLY CORRECT
@hannahkm
fix gqlgen tests
6dfa49e
@hannahkm
fix appsec contrib tests
b770e1c
@hannahkm
update traceproftest mod
1426e57
@hannahkm
easy test fixes
1eb3756
@hannahkm
contrib test fixes
e6b61b2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@datadog-datadog-prod-us1 datadog-datadog-prod-us1[bot] datadog-datadog-prod-us1[bot] left review comments

Assignees
No one assigned
Labels
apm:ecosystem contrib/* related feature requests or bugs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@hannahkm @mtoffl01 @rarguelloF @eliottness @darccio @nhulston @tonyredondo